also move to the next match when ctrl+g is pressed. (#156657, Matt T.

2005-07-10  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): also move
	to the next match when ctrl+g is pressed. (#156657, Matt T. Proud).

diff --git a/ChangeLog b/ChangeLog
index 5cb956d97e791b66655a46e8c57d4f5266b0ec6b..35ae3cb7d287ae33963d9ca3724765a61896afa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-10  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): also move
+       to the next match when ctrl+g is pressed. (#156657, Matt T. Proud).
+
 2005-07-10  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): rework

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5cb956d97e791b66655a46e8c57d4f5266b0ec6b..35ae3cb7d287ae33963d9ca3724765a61896afa6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-10  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): also move
+       to the next match when ctrl+g is pressed. (#156657, Matt T. Proud).
+
 2005-07-10  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): rework

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5cb956d97e791b66655a46e8c57d4f5266b0ec6b..35ae3cb7d287ae33963d9ca3724765a61896afa6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-10  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): also move
+       to the next match when ctrl+g is pressed. (#156657, Matt T. Proud).
+
 2005-07-10  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): rework

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 6e472100e0e8e93cadba146273e1a2d4676cead5..30a055471c7adae899a071beb8bc591bcc0ad493 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12641,6 +12641,13 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
       retval = TRUE;
     }
 
+  if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK
+      && (event->keyval == GDK_g || event->keyval == GDK_G))
+    {
+      gtk_tree_view_search_move (widget, tree_view, FALSE);
+      retval = TRUE;
+    }
+
   /* renew the flush timeout */
   if (retval && tree_view->priv->typeselect_flush_timeout)
     {